shell: Remove old jsapi-compat file

As we now depend on mozjs185, we know the API we'll be porting to.

https://bugzilla.gnome.org/show_bug.cgi?id=693284

diff --git a/src/Makefile.am b/src/Makefile.am
index d79d207ea80dc8cf7dc7ccb39ea94c19a5451271..6a6bb242630961a172703fb864f5461deb06f0ca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,7 +145,6 @@ libgnome_shell_la_SOURCES =         \
        shell-app-system-private.h      \
        shell-embedded-window-private.h \
        shell-global-private.h          \
-       shell-jsapi-compat-private.h    \
        shell-window-tracker-private.h  \
        shell-wm-private.h              \
        gnome-shell-plugin.c            \

diff --git a/src/shell-global.c b/src/shell-global.c
index 32da177abf8a230646d23fea0b1fb06fc927e558..1220346972715ae7c911b4de051a0207ccd0e507 100644 (file)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -35,7 +35,6 @@
 
 #include "shell-enum-types.h"
 #include "shell-global-private.h"
-#include "shell-jsapi-compat-private.h"
 #include "shell-perf-log.h"
 #include "shell-window-tracker.h"
 #include "shell-wm.h"

diff --git a/src/shell-jsapi-compat-private.h b/src/shell-jsapi-compat-private.h
deleted file mode 100644 (file)
index 7f0304b..0000000
--- a/src/shell-jsapi-compat-private.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * shell-jsapi-compat.h: Compatibility wrapper for older Spidermonkey
- *
- * Copyright 2010 Red Hat, Inc.
-*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
- * more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __SHELL_JSAPI_COMPAT_H__
-#define __SHELL_JSAPI_COMPAT_H__
-
-#include "config.h"
-
-#ifndef HAVE_JS_NEWGLOBALOBJECT
-
-/* The old JS_AddRoot accepted anything via void *, new
- * api is stricter.
- */
-#define JS_AddValueRoot JS_AddRoot
-#define JS_AddObjectRoot JS_AddRoot
-#define JS_AddStringRoot JS_AddRoot
-#define JS_AddGCThingRoot JS_AddRoot
-#define JS_RemoveValueRoot JS_RemoveRoot
-#define JS_RemoveObjectRoot JS_RemoveRoot
-#define JS_RemoveStringRoot JS_RemoveRoot
-#define JS_RemoveGCThingRoot JS_RemoveRoot
-
-#endif
-
-#endif